cssvalue: Add a CSS value for arrays

Make the value auto-cycle its child values, so it can be used for
background properties.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7559239ae5879bf2089f6a31189133fadceb4384..740c155ac44b2d574a91892749853e931b0041d5 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -423,6 +423,7 @@ gtk_private_h_sources =             \
        gtkcolorscaleprivate.h  \
        gtkcolorchooserprivate.h        \
        gtkcontainerprivate.h   \
+       gtkcssarrayvalueprivate.h       \
        gtkcsscomputedvaluesprivate.h \
        gtkcsscustompropertyprivate.h \
        gtkcssimagegradientprivate.h    \
@@ -620,6 +621,7 @@ gtk_base_c_sources =                \
        gtkcombobox.c           \
        gtkcomboboxtext.c       \
        gtkcontainer.c          \
+       gtkcssarrayvalue.c      \
        gtkcsscomputedvalues.c  \
        gtkcsscustomproperty.c  \
        gtkcssimage.c           \

diff --git a/gtk/gtkcssarrayvalue.c b/gtk/gtkcssarrayvalue.c
new file mode 100644 (file)
index 0000000..ba919da
--- /dev/null
+++ b/gtk/gtkcssarrayvalue.c
@@ -0,0 +1,102 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include "gtkcssarrayvalueprivate.h"
+
+#include <string.h>
+
+struct _GtkCssValue {
+  GTK_CSS_VALUE_BASE
+  guint         n_values;
+  GtkCssValue  *values[1];
+};
+
+static void
+gtk_css_value_array_free (GtkCssValue *value)
+{
+  guint i;
+
+  for (i = 0; i < value->n_values; i++)
+    {
+      _gtk_css_value_unref (value->values[i]);
+    }
+
+  g_slice_free1 (sizeof (GtkCssValue) + sizeof (GtkCssValue *) * (value->n_values - 1), value);
+}
+
+static void
+gtk_css_value_array_print (const GtkCssValue *value,
+                           GString           *string)
+{
+  guint i;
+
+  if (value->n_values == 0)
+    {
+      g_string_append (string, "none");
+      return;
+    }
+
+  for (i = 0; i < value->n_values; i++)
+    {
+      if (i > 0)
+        g_string_append (string, ", ");
+      _gtk_css_value_print (value->values[i], string);
+    }
+}
+
+static const GtkCssValueClass GTK_CSS_VALUE_ARRAY = {
+  gtk_css_value_array_free,
+  gtk_css_value_array_print
+};
+
+GtkCssValue *
+_gtk_css_array_value_new (GtkCssValue **values,
+                          guint         n_values)
+{
+  GtkCssValue *result;
+  
+  g_return_val_if_fail (values != NULL || n_values == 0, NULL);
+
+  result = _gtk_css_value_alloc (&GTK_CSS_VALUE_ARRAY, sizeof (GtkCssValue) + sizeof (GtkCssValue *) * (MAX (1, n_values) - 1));
+  result->n_values = n_values;
+  memcpy (&result->values[0], values, sizeof (GtkCssValue *) * n_values);
+
+  return result;
+}
+
+GtkCssValue *
+_gtk_css_array_value_get_nth (const GtkCssValue *value,
+                              guint              i)
+{
+  g_return_val_if_fail (value != NULL, NULL);
+  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_ARRAY, NULL);
+  g_return_val_if_fail (value->n_values > 0, NULL);
+
+  return value->values[i % value->n_values];
+}
+
+guint
+_gtk_css_array_value_get_n_values (const GtkCssValue *value)
+{
+  g_return_val_if_fail (value != NULL, 0);
+  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_ARRAY, 0);
+
+  return value->n_values;
+}
+

diff --git a/gtk/gtkcssarrayvalueprivate.h b/gtk/gtkcssarrayvalueprivate.h
new file mode 100644 (file)
index 0000000..08b6e4a
--- /dev/null
+++ b/gtk/gtkcssarrayvalueprivate.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2012 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Alexander Larsson <alexl@gnome.org>
+ */
+
+#ifndef __GTK_CSS_ARRAY_VALUE_PRIVATE_H__
+#define __GTK_CSS_ARRAY_VALUE_PRIVATE_H__
+
+#include "gtkcssvalueprivate.h"
+
+G_BEGIN_DECLS
+
+GtkCssValue *       _gtk_css_array_value_new            (GtkCssValue          **values,
+                                                         guint                  n_values);
+
+GtkCssValue *       _gtk_css_array_value_get_nth        (const GtkCssValue     *value,
+                                                         guint                  i);
+guint               _gtk_css_array_value_get_n_values   (const GtkCssValue     *value);
+
+
+G_END_DECLS
+
+#endif /* __GTK_CSS_ARRAY_VALUE_PRIVATE_H__ */